fix: avoid entry author deadlocks - #19363
Open
mvanhorn wants to merge 3 commits into
Open
Conversation
Member
|
Thanks for the PR! You’ve got a couple PhpStan issues to address in |
Contributor
Author
|
PhpStan issues fixed. The entry ids are held in locals asserted non-null before they reach |
Member
|
@mvanhorn I’m still seeing the same issues reported: https://github.com/craftcms/cms/actions/runs/30971781851/job/92197500971?pr=19363 |
Hold the saved entry ids in locals asserted non-null before passing them to _savedAuthors, so the nullable id property no longer trips PhpStan.
mvanhorn
force-pushed
the
fix/15768-entry-author-deadlocks
branch
from
August 6, 2026 06:27
88ed008 to
ef0ed8f
Compare
The helper referenced craft\db\Command::EVENT_BEFORE_EXECUTE, which does not exist on craft\db\Command or yii\db\Command, so PHPStan failed and the test raised an Error at runtime. The query log is not an alternative here: Codeception swaps in a logger that drops anything below LEVEL_INFO and explicitly skips yii\db\Command categories, so the statements never reach it. Swap Connection::$commandClass for a recording subclass instead, which createCommand() honors, and restore it afterwards. The assertions are unchanged, and they still fail with Db::delete in place of Db::deleteIfExists.
mvanhorn
force-pushed
the
fix/15768-entry-author-deadlocks
branch
from
August 6, 2026 14:05
ef0ed8f to
d4b9b76
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Change
Entry::_saveAuthors()to use the existingDb::deleteIfExists()helper forentries_authors, which performs the delete only when matching rows exist and was designed to avoid deadlocks caused by deleting absent rows. Keep the existing author lookup and batch insert behavior intact so author replacement on established entries and initial author persistence continue to work across supported databases. Add a focused regression inEntriesTestthat observes the database commands for an initial authored-entry save versus an author update: the initial save must not execute a delete for its absent author rows, while the update must still remove the existing rows and persist the replacement author.Concurrent entry creation can intermittently deadlock on MySQL or MariaDB while
Entry::_saveAuthors()writes toentries_authors. The thread includes reproductions from queue jobs, load-balanced installations, Craft Cloud, and a core-only control-panel flow, with InnoDB diagnostics showing distinct new entry IDs contending on the primary-index supremum. The save path currently issues an unconditional delete for an entry ID before inserting its authors, even when a newly-created entry cannot have author rows yet. That empty-range delete can take a gap lock that conflicts with another transaction following the same delete-then-insert sequence.Fixes #15768
Related issues
Not applicable to this change.